Autogenerated HTML docs for v1.6.5-rc0-8-g434a
diff --git a/git-am.txt b/git-am.txt index 87781f4..67ad5da 100644 --- a/git-am.txt +++ b/git-am.txt
@@ -13,7 +13,7 @@ [--3way] [--interactive] [--committer-date-is-author-date] [--ignore-date] [--ignore-space-change | --ignore-whitespace] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] - [--reject] [-q | --quiet] [--scissors] + [--reject] [-q | --quiet] [--scissors | --no-scissors] [<mbox> | <Maildir>...] 'git am' (--skip | --resolved | --abort) @@ -44,6 +44,9 @@ Remove everything in body before a scissors line (see linkgit:git-mailinfo[1]). +---no-scissors:: + Ignore scissors lines (see linkgit:git-mailinfo[1]). + -q:: --quiet:: Be quiet. Only print error messages.
